Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 20:07:16 +0000 (13:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 20:07:16 +0000 (13:07 -0700)
commit58c5199f96f61db20f3a8a5aaf708d32983d7668
tree32a4bafb394ed8d6288c321b8289a6fe28f70da5
parent4f4912ff909b624e384644d0dfa80ab028bd3cdd
parent154a47d861d9dfec84977f5f865efd40d2eb3b42
Merge from trunk.